Enterprise Version
careful repair approach